Corrected some order-of-ops related issues.