More work
Fixes