Minor fixes and bump dependencies