Fixes after restructuring