Minor improvements / fixes