Minor fixes, maybe