Fixed pampoint issues