Min. fix
Extracting more constants
Fixing projection support