KGSL fix and cleanup