Hotfixes for wrong use statement