Fixes regarding opened issues