Small fixes, nothing major