[General] fixes