Minor fixes, nothing special