IBT: Code consolidation, fixes for scripting languages