Fixes for Autometa 1.0