Quick fixes.

@DFurnes