[PATCH 0/3] Fix some issues with the advanced user options