Fixed small issues created by bluenose.