some smaller fixes for gadgets