DLL and project fixes