Another bunch of annoyingly small fixes