Fixes (thanks Zyborg)