Fixes for PEEK