Fixes, more needed