Fixes by MitkoK for other places