Fixes and tweax