quick fixes for #1080