Fixes (thanks Dark!)