Some chartboots changes