Fixes and image export