Clean up force selection, fix gcc warning