Fix bugs, that i found