Fix slight bugs