Debug, slight fixes