Fixes for ps 2