Some scriptable fixes