Fixes/refactoring after 1.0 sync