Some minor fixes

@techhat, could you? please?