Standalone package builds OK now