Registers window bugs fixed