Finishing fixes