Fixed references for cross-platform compatibility