Various fixes

- Registration problems