Fixes by dannuic