Fixes for comments etc