Fix some silly implementation details