Fixes for the incorrectly named object 'star' (should have been 'self'!)
Authored by: bugman 2009-10-08
Parent: [r9673]
Child: [r9675]