Fixes, should be ready for merge