Fix initial allocation bugs

No idea who added this nonsense.