Options: Small improvements and fixes