Fixed some latches