Hopefull fixes