Some silly fixes