Signs and misc fixes