Fix issues after restructuring