Fixes more bugs
Fix