fixing 2 things