Continuation of 950d73766e55e65422dd35fa1de7100a43ee5f44

Fix some more sillyness