Fixes

Thanks @philfreo to review