Fixes for smuxi