2 things to fix after work...