Some fixing stuff