Various fix for 0.0.45