Fixes and more bugs