Few slight fixes