Engine::Small bugfixes