Fixes for deobf