Moved from Lamson to Salmon, fixes for missing callback