Fixed issues while modding