fixes after testing with real packages