Some optimizations [deploy snapshot]