Fixes and vars