Fixes and cleanups
Reset latches