minor issues fixed

Sorry but discovered some minor issues which I though I solved earlier
xD