Finished drawing fixes