Various little improvements