Make a few things a bit more valid