006

Further fixes for screenshot saving.