Proper handling of dependencies versions. Minor fixes.