Fixes overlooked in previous push