Some small fixes, nothing big