More item builder improvements.