fixes for amy