Some minor adjustements I forgot to uncomment/remove