Bugfixes + remove some Magnolia-specific methods