Fixed some issues with passing through of boolean property and options.