Various fixes and updates: