Portability enhancements + DBUtil enhancements