Fixed warnings + update from Max