Reducing further compiler warnings and removing colour issue from #145