Fixes

@jone