Few fixes in entry register