Fixed missing server hooks

Should fix a few issues :)
Was there a reason to separate these?
Also this is missing the enable tags.