Fixing some stuff from 'random keyword' that leaked in here somehow (git push mode fail, surely)