Fixes for peter