Few fixes for shawn