Minor fixes, dependency updates