Various fixes for system reg