Some small fixes left