Minor fixes with colors and error messages