Minor improvements

See commit descriptions