Minor changes, warnings supressed