RlsBB NFO

    1. Fixed couple of bugs which I found while porting to Switch.
    2.