Some stuff + registration fix