applied fixes