Slight modifications to hacky workaround for Acme re-draw issue