Small fixes

@greysteil a review and merge would be appreciated please.