Fixed all swapr stuff