Just some minor bug fixes