compile fixes by Unthinkingbit