fixed compilation errors should now work to compile with generic and dv