SATA bugfix, compile cleaning