Various fixes and planning