Siter fixes and updates