quick fix for minor bugs