Fixed problems with release build.