Fixes for restructuring