Fixes (unstable, don't upload to markets)