Quick fixes for some AWS plugins