Some small fixes :|