Additional fixes, working condition