fixes for different issues