Fixing all se bugs