Fixes for Amanda