Fixed issues found by @yo