Fixed some issues with new version of construct library.