Fixes by Oilman recommendations