Fixes for perfect score. Yay!!