Michal fixes