Reimport of FPS setup / minor fix