Minor fixes on conditions
Refactor special GL4 objects