Misc changes and additionals in SE/consistency