Various fixes and improvements which are too small to deserve an own
directory.