Bug fixes regarding am - pm