Fix an error with case-sensitivity and some other stuff

Signed-off-by: netcho <kkotlarski@abv.bg>