Debugging

Small fixes