Fixes by EudGenius.