Various fixes for Widgets params