Fixed date am/pm issues