System pointer + prototype fixes