Minor bugs with an annoying log...