Fixed stuff with Wilee's and Wild's changes