Fixes

@adamdahan