all kind of issue fixes