Simplified build somewhat