Fixes for moonstick