Fixes to the latest full version