Minor fixes

More research