"fix" some issues I have no issues with