Fixing up code for release