A few minor fixes and caught both!