Fixed date converter and other minor stuf