Fix per molenz's comments