Some guard watching improvements