some tweaks and fixes for solder