Fix site and siteid options not working

Additional fix for #2.