some silly fixes