Fix some things for testing