Fixes from my project :3