Minor fixes and updating deps