some fixes I needed