Fix minor bugs, that version is usable