fixes for small issues