Fixed recent problems (all working now as before git migration)