Fix a tiny bug
Fix some more bugs