[0.0.23m] Some more updates