Fix further issues