Fixing missing use statements