Fixes by Alexander