Fixes in previous commit, shader optimaliaztion.