Issues deteced by Static Code Analysis fixed