Fixes by Ott 2