Cleaning up some minor issue for external consumption