Fixes and plans