Meh, more stuff to make sure things work