Minor fixes by Z4ppy