some fixes for me