some bug fixes - DST issues, mock generator bug