various fixes for Tool Labs.