Fixes related for hooks and param-less classes