Fixes by Max