Some more cleanup and rmeta fixes